Make drop on NS/OSX behave the same as other platforms (Bug 5855 and 10050).

* doc/emacs/macos.texi (Mac / GNUstep Customization): Remove text about
ns-find-file and ns-drag-file (Bug#5855, Bug#10050).

* lisp/term/ns-win.el (global-map): Bind ns-drag-file to
ns-find-file (Bug#5855, Bug#10050).

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 0ce5d23b5e8d22ad98a876ae70e578dd70ddc39c..685db981acb4e3f27601bc9ffbbb8cc8ef8a46d1 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-25  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * macos.texi (Mac / GNUstep Customization): Remove text about
+       ns-find-file and ns-drag-file (Bug#5855, Bug#10050).
+
 2012-02-25  Dani Moncayo  <dmoncayo@gmail.com>  (tiny change)
 
        * buffers.texi (Select Buffer): Mention that saving in a new file

diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index fb70a462bd1c37dbb1ee24adabf287e4034597de..10293fe7747203aafed4bb0909b405eea02a6231 100644 (file)
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -113,18 +113,6 @@ close the altered one.
 Useful in this context is the listing of all faces obtained by
 @kbd{M-x list-faces-display}.
 
-@subsection Open files by dragging to an Emacs window
-
-The default behavior when a user drags files from another application
-into an Emacs frame is to insert the contents of all the dragged files
-into the current buffer.  To remap the @code{ns-drag-file} event to
-open the dragged files in the current frame use the following line:
-
-@lisp
-(define-key global-map [ns-drag-file] 'ns-find-file)
-@end lisp
-
-
 @subsection Customization options specific to Mac OS / GNUstep
 
 The following customization options are specific to the Nextstep port.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0f3a1a0bc05570d823fcd91d74c7b3072015a333..81409738e089e9700cc4b2d5c0b205276dad3e49 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-25  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * term/ns-win.el (global-map): Bind ns-drag-file to
+       ns-find-file (Bug#5855, Bug#10050).
+
+
 2012-02-25  Andreas Schwab  <schwab@linux-m68k.org>
 
        * calendar/parse-time.el (parse-time-string): Allow extractor to

diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 2782d63b719ac94e86c0e3b10812eeeb3b7fe21e..b681ec3440f80c82a06e93fe3c3302011ef9e959 100644 (file)
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -163,7 +163,7 @@ The properties returned may include `top', `left', `height', and `width'."
 (define-key global-map [ns-power-off] 'save-buffers-kill-emacs)
 (define-key global-map [ns-open-file] 'ns-find-file)
 (define-key global-map [ns-open-temp-file] [ns-open-file])
-(define-key global-map [ns-drag-file] 'ns-insert-file)
+(define-key global-map [ns-drag-file] 'ns-find-file)
 (define-key global-map [ns-drag-color] 'ns-set-foreground-at-mouse)
 (define-key global-map [S-ns-drag-color] 'ns-set-background-at-mouse)
 (define-key global-map [ns-drag-text] 'ns-insert-text)